gnomeos: Some fixes for install script

diff --git a/gnomeos/yocto/gnomeos-install.sh b/gnomeos/yocto/gnomeos-install.sh
index bc10b800e21e481f3236c8ff85465bae64e4ed86..2b796bbc69dddc8a0f1c2aca37968f56822a026c 100755 (executable)
--- a/gnomeos/yocto/gnomeos-install.sh
+++ b/gnomeos/yocto/gnomeos-install.sh
@@ -40,6 +40,8 @@ usage () {
 ARCH=i686
 BRANCH_PREFIX="gnomeos-3.4-${ARCH}-"
 
+cd /ostree
+
 if ! test -d /ostree/repo/objects; then
     mkdir -p /ostree
 
@@ -51,7 +53,6 @@ ostree-pull --repo=repo origin gnomeos-3.4-i686-{runtime,devel}
 
 uname=$(uname -r)
 
-cd /ostree
 for branch in runtime devel; do
     rev=$(ostree --repo=$(pwd)/repo rev-parse ${BRANCH_PREFIX}${branch});
     if ! test -d ${BRANCH_PREFIX}${branch}-${rev}; then

diff --git a/gnomeos/yocto/ostree-setup.sh b/gnomeos/yocto/ostree-setup.sh
index c5c9ec2001020ddfcfa9dfd4e06d0815cddf947e..bfe8cbfb1416b250c600e18772783f4b5be01c6e 100755 (executable)
--- a/gnomeos/yocto/ostree-setup.sh
+++ b/gnomeos/yocto/ostree-setup.sh
@@ -56,7 +56,7 @@ if ! test -L run; then
     ln -s ../run run
 fi
 
-mkdir ./var/lib/gdm
+mkdir -p ./var/lib/gdm
 chown 2:2 ./var/lib/gdm
 
 touch ./var/shadow
@@ -73,5 +73,7 @@ dbus:*:1:
 gdm:*:2:
 EOF
 
-mkdir repo
-ostree --repo=repo init
+if ! test -d repo; then
+    mkdir repo
+    ostree --repo=repo init
+fi